typo: occured -> occurred

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt
index e27f65155268098fe86074f6aee52aeaeb2316b0..b6f0431a24a2053e92431da7398b237da8701e1b 100644 (file)
--- a/docs/misc/xsm-flask.txt
+++ b/docs/misc/xsm-flask.txt
@@ -1,4 +1,4 @@
-These notes are compiled from xen-devel questions and postings that have occured
+These notes are compiled from xen-devel questions and postings that have occurred
 since the inclusion of XSM.  These notes are not intended to be definitive
 documentation but should address many common problems that arrise when
 experimenting with XSM:FLASK.

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index 2ef204315e05fa19f81ef6ee27e1f9d6c47696d6..113d49ad31451c990d08e6e7d726ebd62bb4585c 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -354,7 +354,7 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code,
                vcpu_schedule_unlock_irq(v);
                irqlocked = 0;
 
-               printk("Terminal machine check exception occured in "
+               printk("Terminal machine check exception occurred in "
                    "hypervisor context.\n");
 
                /* If MCG_STATUS_EIPV indicates, the IP on the stack is related
@@ -666,7 +666,7 @@ void x86_mcinfo_dump(struct mc_info *mi)
                        mc_global->mc_coreid, mc_global->mc_gstatus);
        } else {
                printk(XENLOG_WARNING "MCE: The hardware reports a non "
-                       "fatal, correctable incident occured on "
+                       "fatal, correctable incident occurred on "
                        "CPU %d.\n",
                        mc_global->mc_coreid);
        }

diff --git a/xen/arch/x86/x86_32/supervisor_mode_kernel.S b/xen/arch/x86/x86_32/supervisor_mode_kernel.S
index 39a74ac653e227bcf4d415cb039996a0585e2c35..a4fae6c3f360b47ea2e72142229e7ae42de56715 100644 (file)
--- a/xen/arch/x86/x86_32/supervisor_mode_kernel.S
+++ b/xen/arch/x86/x86_32/supervisor_mode_kernel.S
@@ -98,7 +98,7 @@ ENTRY(fixup_ring0_guest_stack)
         addl $((6+4)*4),%esi
 
         # %gs:%esi now points to the guest stack before the
-        # interrupt/exception occured.
+        # interrupt/exception occurred.
 
         movl  $PER_CPU_GDT_ENTRY*8,%ecx
         lsll  %ecx,%ecx

diff --git a/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h b/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h
index 48822c0811d8c02066e078e27ca28309df798bcb..0d2c54fc5006d28652e0f79b5d92749f8aeeaabc 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h
+++ b/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h
@@ -67,7 +67,7 @@ typedef struct {
         unsigned long   ip;                     /* where did the overflow interrupt happened  */
         unsigned long   tstamp;                 /* ar.itc when entering perfmon intr. handler */
 
-        unsigned short  cpu;                    /* cpu on which the overfow occured */
+        unsigned short  cpu;                    /* cpu on which the overfow occurred */
         unsigned short  set;                    /* event set active when overflow ocurred   */
         int                    tgid;                   /* thread group id (for NPTL, this is getpid()) */
 } pfm_default_smpl_entry_t;

diff --git a/xen/include/asm-ia64/linux-xen/linux/efi.h b/xen/include/asm-ia64/linux-xen/linux/efi.h
index 4d53746fbc7b4deda095c364494ab3bcbbf4153d..2229101a261f907feb854aa2cfdc80aadfde90a6 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/linux/efi.h
+++ b/xen/include/asm-ia64/linux-xen/linux/efi.h
@@ -469,7 +469,7 @@ struct efi_generic_dev_path {
 
 /* rr7 (and rr6) may already be set to XEN_EFI_RR7 (and XEN_EFI_RR6), which
  * would indicate a nested EFI, SAL or PAL call, such
- * as from an MCA. This may have occured during a call
+ * as from an MCA. This may have occurred during a call
  * to set_one_rr_efi(). To be safe, repin everything anyway.
  */